-
-
Notifications
You must be signed in to change notification settings - Fork 684
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Restructured widget initialization order #2942
base: main
Are you sure you want to change the base?
Conversation
Huh, I hadn't noticed that the Textual base widget (and for that matter the web one too, though that isn't tested here) didn't already call reapply. Now that it's being called from the interface's initializer, it crashes. I currently know nothing about the Textual backend; will have to look more into this. |
A thought occurs to me. Rather than simply change all of TogaApplicator's uses of self.widget to self.node, would you object to a property that aliases widget to node? It would just be syntactic sugar... but it would be nice to keep the more specific / self-explanatory attribute name, since TogaApplicator will presumably only ever be operating on widgets. |
I'm not sure I completely follow the motivation for the |
Yes and no, I suppose. This whole thing is essentially a cleanup, isn't it? My goal with this PR was to do the Toga half of the reorganization described in beeware/travertino#224. With the reorganization I proposed: BeforeWidgetSubclass.__init__(style)
|
| Widget.__init__(style=style)
| |
| | Node.__init__(style=style if style else Pack(), applicator=TogaApplicator(self))
| | | ...
| | |___________
| |
| | self._impl = None
| | self.factory = get_platform_factory()
| |______
|
| self._impl = self.factory.WidgetSubClass(interface=self)
| |
| | ImplementationWidget.__init__(interface=interface)
| | |
| | | self.interface = interface
| | | self.interface._impl = self
| | | # Unnecessary, since this is already being assigned to self._impl above
| | |
| | | self.create()
| | | self.interface.style.reapply()
| | | # This is where all the styles are actually applied for the first time.
| | |___________
| |_______________
|___________________ AfterWidgetSubclass.__init__(style)
|
| Widget.__init__(style=style)
| |
| | Node.__init__(style=style if style else Pack(), applicator=None)
| | | ...
| | |___________
| |
| | self.factory = get_platform_factory()
| | self._impl = getattr(self.factory, self.however_we_store_implementation_name)(interface=self)
| | |
| | | ImplementationWidget.__init__(interface=interface)
| | | |
| | | | self.interface = interface
| | | | self.create()
| | | |_______
| | |___________
| |
| | self.applicator = TogaApplicator(self)
| | # Applicator property will trigger a reapply when set.
| |_______________
|___________________ Beforehand / currently, each widget subclass calls If, as proposed,
I suppose I could instead try putting it in each subclass |
True... except that there are downstream consequences. In particular, while I can appreciate the "consistent logic" portion of moving the create impl part into the base class, that makes some uses cases difficult (or impossible). The core of the problem is that the widget is no longer responsible for determining how to instantiate it's own For an example in the wild - toga-chart doesn't have an Another example is a third-party widget like BitmapView - that's a "normal" widget in the sense of it having an
That would be my inclination. There's still going to be a migration issue for subclassed widgets, but at least there will be a viable path for moving forward. Better still would be to find a way that doesn't have this backwards incompatibility... but I don't have any immediate ideas for what that would look like. |
…tion back in subclass inits
Thank you for the context. My brain's hurting a little figuring out how and why toga.Chart works the way it does. I would have expected something like that to either subclass Chart, or to subclass something like Box and contain the Chart and/or other widgets; subclassing base Widget while using the I've made a first stab at reordering all the |
@@ -32,7 +32,7 @@ def create(self): | |||
self._icon = None | |||
|
|||
self.native.buttonType = NSMomentaryPushInButton | |||
self._set_button_style() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was getting called when Button's implementation is created, but it presupposes the existence of the button's style — which isn't there until Button calls super.__init__()
. It also gets called when the button's font, bounds, or icon are set, and commenting it out here doesn't affect any testbed tests, so it seems it's still getting sufficiently applied. (I'm betting there are a few spots like this in the other implementation layers, though.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
With the reordering I just did, this line no longer causes an issue. However... since leaving it out doesn't have any observable effect and the tests all pass, just leave it out I guess?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
_set_button_style()
will be invoked by set_bounds
, which will be invoked at least once after styles have been established, so I think you're right that the call in the constructor is a no-op (or, at least, not required). It may not have been in the past, if styles weren't being consistently re-applied after a font change, height change, or adding an icon.
One thing to note about this arrangement is that it still prevents a subclass of an existing widget from choosing a different implementation. TextInput gets around this by calling Then again, I suspect this might be replaced entirely by a different mechanism in #2687. |
An earlier implementation did subclass Canvas - the problem becomes that the API of Canvas then becomes public API for this new widget (specifically, the
This would have been another viable approach - and one that would make sense if there was more than 1 widget being composed. However, while the API surface of toga.Box isn't prone to the same issue as toga.Chart - but it still represents an extra overhead of a widget that isn't actually doing anything (a box that contains... a box).
That's definitely something worth doing. We haven't formally documented the contract for a custom widget, but if doing so will simplify the work here, then we should consider it.
That's more than fair :-) Understanding the direction the widget contract is heading doesn't necessarily mean fully formally defining and documenting it - but I definitely appreciate the desire to close off the scope for this issue at some point. |
I'm not averse to getting into a few more weeds, and it does seem inextricably linked to getting this PR done sensibly. So far I see five potential paths for making a custom widget:
Presuming we want to support all five:
There is, of course, always the option of choosing to explicitly not support one or more of the above, the way PIL.Image explicitly doesn't support inherited subclasses. Not ideal, but worth remembering. I think I also need to look more into how the platform/factory/implementation selection works in the first place, so I better understand what's being proposed in #2928. That's all I've got in my head so far. Any thoughts/comments/direction at this point? |
With regards to type 5, with some initial tinkering, pulling the wrapper functionality of Chart out into a separate class seems to work, at least for the included example: class WidgetWrapper(Widget):
def __init__(
self,
WidgetClass: type[Widget],
id: str = None,
style=None,
*args,
**kwargs
):
self.wrapped_widget = WidgetClass(*args, **kwargs)
self._impl = self.wrapped_widget._impl
super().__init__(id=id, style=style)
@Widget.app.setter
def app(self, app):
# Invoke the superclass property setter
Widget.app.fset(self, app)
# Point the canvas to the same app
self.wrapped_widget.app = app
@Widget.window.setter
def window(self, window):
# Invoke the superclass property setter
Widget.window.fset(self, window)
# Point the canvas to the same window
self.wrapped_widget.window = window
class Chart(WidgetWrapper):
def __init__(
self,
id: str = None,
style=None,
on_resize: callable = None,
on_draw: callable = None,
):
"""..."""
self.on_draw = on_draw
if on_resize is None:
on_resize = self._on_resize
super().__init__(Canvas, id=id, style=style, on_resize=on_resize)
self.canvas = self.wrapped_widget (At least, it works as well as the existing code. Resizing the window is identically buggy in both... case in point for this being subtle and hard to get right.) |
It looks like a good summary of the options/usage patterns to me. Regarding (5); I agree it's odd, but if locking out that particular design pattern in favor of an alternative approach makes sense, I'm not fundamentally opposed, as long as the broader use case can be satisfied in other ways. As for your alternate toga-chart - two questions:
|
Huh... apparently that is indeed all you need. What were those app and window setter overrides for? They were in there, so I assumed they were necessary. But taking them out doesn't seem to change anything. I'd already found that there's similarly no need to supply the style to the wrapped widget, either. I guess this is simpler than I thought it was. Except possibly for whatever's causing...
I've submitted it here: beeware/toga-chart#191 |
On further reflection: if we treat the outer widget as the "real" one — it's the one inserted into layouts, assigned to the window, given style properties, etc. — and the inner widget is an orphan whose methods and Another option — and I suspect this is what you were going for with the setter overrides I mentioned — is to monkey about with what the inner widget has access to. If we went that route, I'd be inclined to try a Either way, it would probably be a good idea to parametrize a wrapped widget into some existing tests. |
Who would've guessed there would indeed be weird problems! I haven't really done any Toga testing on platforms besides macOS, so it may take me a minute to set up emulators and virtual machines and track these all down. We may need to start formalizing what an implementation is and isn't allowed to reach back up and access on its interface... or at least when it can do so. I don't have any recommendations on that until I look more into this, though. |
I've taken the cue from TextInput and PasswordInput and put each class's implementation-setting logic in a Using I'm not sure how to proceed with Textual... The addition of the |
(Requesting review less in the sense of "Here, I think it's done" than "How the heck does Textual work?") |
Found it, in testbed/tests/testbed.py: # Textual backend does not yet support testing.
# However, this will verify a Textual app can at least start.
if app.factory.__name__.startswith("toga_textual"):
time.sleep(1) # wait for the Textual app to start
app.returncode = 0 if app._impl.native.is_running else 1
return The quick fix, of course, would be to comment this out until Textual has enough of an implementation to survive a Edit: Guess that wasn't even a quick fix after all. |
Okay. I've changed and reverted several things over the course of this PR so far, so here's an updated summary of what's currently in it:
I keep thinking this, but... "reapply" is honestly a misleading name for its method, especially since it's the first thing called on the style when a widget is created. It's really more of an "apply_all". |
FYI - I'm currently on a crunch to get a talk ready for PyCon AU; it might take me a bit to get to reviewing this. I'll try to review it sooner, but if you haven't heard anything by the end of next week, give me a poke. |
No worries, thanks for the heads up! I'm going to be unusually busy this week myself, and may not be around here anyway. Good luck with the talk! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks really good, and about as painless as a change of this magnitude could be. It does make me wonder if this should be a trigger for a 0.5 bump in Toga. The exact sequence of this change, the Travertino change (and whether that's a 0.4.0 change), and the Rubicon ObjC change (see #2978) will be something we need to work out.
A couple of questions about the final form of the _create()
interface, but otherwise, I think this is in good shape.
@@ -32,7 +32,7 @@ def create(self): | |||
self._icon = None | |||
|
|||
self.native.buttonType = NSMomentaryPushInButton | |||
self._set_button_style() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
_set_button_style()
will be invoked by set_bounds
, which will be invoked at least once after styles have been established, so I think you're right that the call in the constructor is a no-op (or, at least, not required). It may not have been in the past, if styles weren't being consistently re-applied after a font change, height change, or adding an icon.
"""The widget to which this applicator is assigned. | ||
Syntactic sugar over the node attribute set by Travertino. | ||
""" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would be worth marking this as deprecated as well - if any code is using it, that code should be notified of the potential problem.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That was my first thought too, but — does it do any harm? I actually reverted my initial change of the existing uses of applicator.widget
; my thinking being that in the context of Toga, a node should always be a widget, so "widget" is a more specific (and for anyone reading Toga code, more obvious) name for it. Does that track?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah - I think that makes sense. Good call.
core/src/toga/style/pack.py
Outdated
Font( | ||
# For other properties, a backend that doesn't support it will simply do | ||
# a no-op when instructed to set it. But for font, we need to know | ||
# up-front, because just creating a Font object will fail. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can't argue with the logic; but how did you discover this (or, more importantly, why didn't it occur before)? I'm guessing it's Web or Textual that was the problem; I'm wondering if the fix here is to require a bare-bones Font implementation as a minimum for a working backend, rather than making the applicator more complex.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It was for Textual, and it never came up before because Textual's Widget base initializer didn't call a style reapply. With this PR, the core initializer reapplies the style, meaning it tries it for all tested backends — including Textual, which threw a NotImplemented error. (I'm sure it would for web too, if it were tested at all.)
I don't know that I have any particular opinion on whether it's better to check in the applicator or require Font in the backend. The latter seems somewhat arbitrary, but it would streamline this bit in core.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure I'd say requiring a representation of Font is arbitrary; Textual is the only platform I can think of that doesn't have a strong concept of a font - and even there, there are console variants like oblique and bold. We require all platforms to have a concept of Window; I don't think requiring a stub concept of Font is that far off the same requirement.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fair enough, that makes sense. Would a new requirement like that go under a removal changenote?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No - there aren't any alternate backends, so it's only a concern for us internally at this point.
if running: | ||
self.start() | ||
|
||
def _create(self) -> None: | ||
self.factory = get_platform_factory() |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why move the factory to here? Since every widget will need a factory, and we're in control of when _create()
is invoked, I'm not sure I see why it makes sense to set self.factory
, rather than setting it in the base widget and then assuming it exists in _create()
.
Also - would it make sense to make the contract of _create()
return the _impl
? A backend might define other attributes, but if we require that "the" impl is returned, we can guarantee that every widget will have an attribute named _impl
, rather than relying on the backend to use the "right" name.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why move the factory to here? Since every widget will need a factory, and we're in control of when
_create()
is invoked, I'm not sure I see why it makes sense to setself.factory
, rather than setting it in the base widget and then assuming it exists in_create()
.
Because different widgets — in particular third-party widgets — need to be able to customize where they get their implementations from. BitmapView, for instance, rolls its own factory, and Chart doesn't even need one.
Also - would it make sense to make the contract of
_create()
return the_impl
? A backend might define other attributes, but if we require that "the" impl is returned, we can guarantee that every widget will have an attribute named_impl
, rather than relying on the backend to use the "right" name.
That makes a lot of sense, I like it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Because different widgets — in particular third-party widgets — need to be able to customize where they get their implementations from. BitmapView, for instance, rolls its own factory, and Chart doesn't even need one.
That's true; however, in the Chart case, having the factory around doesn't hurt; and in the BitmapView case, right now it can be overwritten, and the long term game is to allow widgets to register themselves, so the system default factory will be useful. Moving it to the _create()
methods means a lot of code churn to add it, and then take it out again in the future when we can rely on a system wide factory.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While we're creating a new API requirement: how do you feel about the name _create
? I just pulled it from the existing code of NumberInput and PasswordInput, but I'm starting to think _create_impl
(or something similar) would be clearer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I guess my counter would be "what else are you planning to create"? It's pretty much an existential method for the widget; on that basis, I don't mind _create()
as a method name.
When I was reviewing, my first reaction was whether we should promote this to a public API - but I convinced myself that wasn't a bridge we needed to cross here. If it turns out there's value in making the method public, we can do that in the future; but the counterexample - that it's a bad idea to be public, because we need to change it as an API - is easy to walk back if it's private.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That makes sense — I was probably just overthinking it.
core/src/toga/widgets/base.py
Outdated
style=style if style else Pack(), | ||
applicator=TogaApplicator(self), | ||
style=style if style is not None else Pack(), | ||
applicator=None, |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we leave this assignment off? None
should be the default value, even in Travertino 0.3.0; I'm not sure there's a gain from being explicit in this instance.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, good point. A case of just following the template of what was there.
That doesn't seem unreasonable to me, seeing as how it does change/tighten the API for subclassing from Widget.
I believe we talked about doing this one before the Travertino change, to minimize the likelihood of users seeing lots of warnings. 0.4.0 definitely makes sense for Travertino, I think, especially if we wait till composite property is ready to go. I've been following the Rubicon developments, though I'd be lying if I said I entirely understood them. I'll defer to you on whether/how that interacts with this. |
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One minor update to a comment (so we know how old the backwards incompatibility code is); but otherwise I think I'm happy with this.
I'd like another set of eyes (@mhsmith) to take a look at this just to make sure I haven't missed/forgotten something through having been buried in this.
Just to make sure we're on the same page (and I haven't missed/forgotten anything in the landing sequence for this and related work):
- Land this PR. This will work with Travertino 0.3.0
- Land Added composite property (and some nearby cleanups) travertino#222 0 - not strictly required, but I think you've indicated it's the last "big feature" you want to get in
- Cut Travertino 0.4.0 release
- Add a PR that bumps the Travertino minimum requirement, and drops the backwards compatibility code for travertino 0.3.0
- Land any other big pieces for 0.5.0 (most notably - the Rubicon issues)
- Cut a Toga 0.5.0 release
Have I missed anything?
# implementation. We still want to call _create(), to issue the warning and | ||
# inform users about where they should be creating the implementation, but if | ||
# there already is one, we don't want to do the assignment and thus replace it | ||
# with None. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I hadn't thought of doing this - nice touch!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Neither did I! This is why tests are so handy.
It would also be helpful to see a "forked" version of this PR that deliberately uses the travertino main branch to prove that this PR works with the new branch as well. That PR will eventually become the "bump the travertino minimum version" update; but as an initial draft, it can install direct from GitHub main to prove the new code will be compatible. |
Co-authored-by: Russell Keith-Magee <russell@keith-magee.com>
Hm. Going off what you laid out in beeware/travertino#224 (comment), I was picturing something more like:
As you pointed out, this minimizes the likelihood of users getting stuck in the middle, with Toga 0.4.8 and Travertino 0.4.0 — which will work, but with lots of errors. If there's some time in between the former and latter parts, so much the better, in that respect.
It might take me a minute to figure out how to do that, but will do! |
Good catch - I'd completely forgotten that previous plan.
From your current checkout of the |
Thanks for the tip! And I found the syntax for pointing to Github from the Rubicon update. : ) Of course I found one more bug I'd missed, amidst checking against the two different versions... |
Fixes #2937
As discussed in beeware/travertino#224 (review), I've written this to work with up-to-date Travertino (with beeware/travertino#232 applied), but also be backwards-compatible with Travertino 0.3.0.
The way I've currently set it up, a widget class (in core) has an
_IMPL_NAME
class attribute that tells Toga what its implementation is named. In all cases here, that's the same as the core/interface class, but this way, subclassing a Toga widget won't suddenly break it.Could be relevant to #2687, in that I've grouped the factory- and implementation-fetching logic for all widgets into the base Widget init.
PR Checklist: